More error-checking
Updating the method offsets