first stab at fixing #3
added catchall if no loading occurs