Merge "Another error check" into klp-dev