Removed excess error handeling.