Merge "Add NullPointerException to try/catch since it's possible to have such an error" into main