Removed Errors
Added Hashmap Check