Some final error checking issues
Final error checking issues