Solves #62 by removing the possibility of a null pointer exception