Removed character limit

Also added error checking.