Improves 90. Fixes null pointer possibility