Merge "Adding error checking"