Merge "More error checks"