#2 - Fixed issue by adding raise clauses to the checks, also fixed some minor grammer issues