• Fixes a possible NullPointerException.
• Fixes some status error messages.