Removed possibility for NullPointerException