Removed check that wasn't needed.
Added error checking to other forms.